]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
network: Remove the firmware changed signal
authorJasper St. Pierre <jstpierre@mecheye.net>
Tue, 16 Jul 2013 22:59:00 +0000 (18:59 -0400)
committerJasper St. Pierre <jstpierre@mecheye.net>
Sun, 28 Jul 2013 19:39:39 +0000 (15:39 -0400)
According to Dan Williams, if firmware is installed the device
will disappear and reappear, and this is unlikely to change any
time soon. Just make our lives easier by removing the tracking.

https://bugzilla.gnome.org/show_bug.cgi?id=704670

js/ui/status/network.js

index 98ba7284efd078fc067bbe68afa588cc3c7561ed..c3cbf41370ec9f6213ab79c27905b07c166b5dae 100644 (file)
@@ -306,10 +306,6 @@ const NMDevice = new Lang.Class({
                 GObject.Object.prototype.disconnect.call(this._device, this._activeConnectionChangedId);
                 this._stateChangedId = 0;
             }
-            if (this._firmwareChangedId) {
-                GObject.Object.prototype.disconnect.call(this._device, this._firmwareChangedId);
-                this._firmwareChangedId = 0;
-            }
 
             this._device = null;
         }
@@ -375,14 +371,6 @@ const NMDevice = new Lang.Class({
         // in the majority of cases (wired, wwan)
     },
 
-    _firmwareChanged: function() {
-        if (this._firmwareChangedId) {
-            GObject.Object.prototype.disconnect.call(this._device, this._firmwareChangedId);
-            this._firmwareChangedId = 0;
-        }
-        this._substateChanged();
-    },
-
     getStatusLabel: function() {
         if (!this._device)
             return null;
@@ -411,9 +399,6 @@ const NMDevice = new Lang.Class({
             // firmware missing), that are exposed by different properties (whose state may
             // or may not updated when we receive state-changed).
             if (this._device.firmware_missing) {
-                if (!this._firmwareChangedId)
-                    this._firmwareChangedId = this._device.connect('notify::firmware-missing', Lang.bind(this, this._firmwareChanged));
-
                 /* Translators: this is for devices that require some kind of firmware or kernel
                    module, which is missing */
                 return _("firmware missing");